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