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

Bug: 120848293
Change-Id: I46bc87c3e4e646fbc55832da76c34c1855b0b196