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

Bug: 120848293
Change-Id: Idb5f838280ed95368724ff4745cacdc39e85889c