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

Bug: 120848293
Change-Id: I04da0a2d261769cd1989e121a9a327cdc72bb24f