am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2

* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.