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

Bug: 120848293
Change-Id: Idbaff4f580a715bc7c51988b0cd7d84837f8b958