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

Bug: 120848293
Change-Id: I6e42ff0c852386211c840d42bfd5378abfaa9c40