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

Bug: 120848293
Change-Id: I76dcb8a77b5f0222a769e021c50f988f68af8f79