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

Bug: 120848293
Change-Id: Ib8f167dded32336ffbaa0c4b45734447b692f4b5