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

Bug: 120848293
Change-Id: Ia9abbfe3a9e788faffe3279256d52beeb81d5f95