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

Bug: 120848293
Change-Id: I306055cd845b7cdd538072e4ea301d064b8d3380