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

Bug: 120848293
Change-Id: Iceec644e27319d39a10c2773a5d9cfb3edc7c359