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

Bug: 120848293
Change-Id: I6884dec9ec91dc358c1f96186b73599a21fcf743