am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

* commit '7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340