Merge commit '69739a19dae87bfa81b7fda1504da58067485296' into eclair-mr2-plus-aosp * commit '69739a19dae87bfa81b7fda1504da58067485296': Log for issue 2203561.