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

Bug: 120848293
Change-Id: Id528b9b2c2a89135fb99b7318fb56379f7faf59e