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

Bug: 120848293
Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e