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

Bug: 120848293
Change-Id: I68f702b5bbcae9b166fdc955d67bb9eb4502ef72