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

Bug: 120848293
Change-Id: Iff205468da1f327eaef19f68dd7b8b4f68ef027b