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

Bug: 120848293
Change-Id: I98437f93e38a7d5ae1557a5485f372bc90524adc