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

Bug: 120848293
Change-Id: I909b455f1b1e142601a37c76d335024b79835f9e