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

Bug: 120848293
Change-Id: I5c91808a99e0412fd00de3b2a6ab0428417abd97