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

Bug: 120848293
Change-Id: Id36f51ad80e8f33f40c57ccfad16d064321ba5e4