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

Bug: 120848293
Change-Id: I2762ab321bdd082f15b517453eeb6c9b90bbed8a