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

Bug: 120848293
Change-Id: I206652fe896f195c707d473907a0dc3abe61c495