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

Bug: 120848293
Change-Id: I4096173a06f2825d3a1b43c57376efeab2e7db0f