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

Bug: 120848293
Change-Id: I598ebd0579d77c70139670be9a7e83ff4224571e