am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id:...
am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '3f3b8cbf':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052