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

Bug: 120848293
Change-Id: Id739cc87378cf165ac253d5fc7dd469a06ca5e66