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

Bug: 120848293
Change-Id: Ia8f8939c93736c4f8977b2e27452e29aa64a826b