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

Bug: 120848293
Change-Id: Ie360a56b58e71335ef1acc28af11f7fae081e7a7