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

Bug: 120848293
Change-Id: Icbfd454e974977438fd32b5d532a2ad1479a8cbc