am 1bf3b382: am e19d06c1: Merge change I92d49bcd into eclair

Merge commit '1bf3b382708563d0628d3669525a83c1a136f278' into eclair-mr2-plus-aosp

* commit '1bf3b382708563d0628d3669525a83c1a136f278':