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

Bug: 120848293
Change-Id: I0a8ad11732f123637bedae3a8cde93dad8697b04