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

Bug: 120848293
Change-Id: I5b0adae51eaf2873d5c6844eabc9eb0c36c88848