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

Bug: 120848293
Change-Id: I0ee032508848c5c13ea97f9a0b6c522440af0fc4