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

Bug: 120848293
Change-Id: I8787b0bf197b53a79114204a5293a4a74ec1e145