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

Bug: 120848293
Change-Id: I4e862f4f5edd1d31e3a2c72bc6dc9dde6d53e9c6