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

Bug: 120848293
Change-Id: I69b2d5f95ac1cff2c0a1902eaef7ce8f0a958539