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

Bug: 120848293
Change-Id: Idb732259bb135f4d1e3968861fdc58263e4c040a