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

Bug: 120848293
Change-Id: I762f68dd64ffa3df45215e60700d05e58dc33e9f