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

Bug: 120848293
Change-Id: Id40dd7bc0c358a489750f01c26f642576a503a9e