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

Bug: 120848293
Change-Id: I13381ac3427156315708f3bfe7f758327ae17dd9