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

Bug: 120848293
Change-Id: I6dd92845be740253fd5245a2a36154b57b986ccd