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

Bug: 120848293
Change-Id: Ie9955d17cb7dbaaff55c8b8479a54901b7da08fb