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

Bug: 120848293
Change-Id: Ia7a99a3162d99899caa1c05e1cf5b25771c10bc5