am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f

* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f