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

Bug: 120848293
Change-Id: I4679c3ee7b6f933b6c242aa4593789fafc5c477b