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

* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340