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

Bug: 120848293
Change-Id: I65a3fdeb75ad3b95b922c578729b28da60e4d2f2