DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I86ae3317759010e4e7b7dc258b8c69c604729ecb