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

Bug: 120848293
Change-Id: Ic39c5ece1b37a560bd150cf3704f4a97154d1e41