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

Bug: 120848293
Change-Id: I0d8e5d07831c13f4b1478d85c56eb4cabe8f9e9a