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

Bug: 120848293
Change-Id: Icba28487cde3a6e33898450eaf53ee2be58a3dc8