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

Bug: 120848293
Change-Id: Ifb4cf1ef450c2ae640c032e2064b697a44eb0851