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

Bug: 120848293
Change-Id: I532ee5bb10d002940116861a8fd0d694ec4b5145