am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '2aeafe0b':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"