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

Bug: 120848293
Change-Id: Ia56b65b4c3fd5acd2da4ce5f53108616185b872c