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

Bug: 120848293
Change-Id: I3be4970ea78ae8ece9bb182d42d549aeab45bd42