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

Bug: 120848293
Change-Id: Ic51faa360cec7e42c0450bfc320dc4322708b3f5