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

Bug: 120848293
Change-Id: I821bc359aba6a5c576114bb7d86ace4675e82a43