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

Bug: 120848293
Change-Id: I5ff493322474850eefbfdf490e5f51613cf5e3a9