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

Bug: 120848293
Change-Id: Ic66712870af54904e54c7046b792391b3ae25f77