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

Bug: 120848293
Change-Id: I8df011f82bc449c9b25401bb39253c787441a7df