Merge changes Idbb70f53,I10426a3f into honeycomb-mr2

* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.