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

Bug: 120848293
Change-Id: Id5b93505f0e715fa4b0ee732ae63730cc38f7c3b