am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f

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