am 897a744b: am b602c328: Merge change I31c52bef into eclair

Merge commit '897a744bb7a95b2d3883004301b8e877cd5efc92' into eclair-mr2-plus-aosp

* commit '897a744bb7a95b2d3883004301b8e877cd5efc92':
  Revert change incorrectly submitted as part of change #32153.