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

Bug: 120848293
Change-Id: I97552ce32bd348334aa8bc857c0eb45b0e2baa83