DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ifcb924cddf616ffacf07c5e7f7feaa1f49917d2d