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

Bug: 120848293
Change-Id: Ieed3c072f46ce2e21cd09268e6878fd61dd5b194