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

Bug: 120848293
Change-Id: Id644e7981ee187c426c4ff3b2788a5ad8514db0c