am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2

* commit '4cd4c82073a6066bb94cce089cd259d19969c0fd':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7