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

Bug: 120848293
Change-Id: I616bdffdfb0bfdc72f8a92cd598cd097acdac98a