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

Bug: 120848293
Change-Id: Ie622c515b59d59e9c73763dbbae6b56959f16f0e