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

Bug: 120848293
Change-Id: I89c08ff4e9ca11ab93067b5d73db3dcdae04a8d2