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

Bug: 120848293
Change-Id: Ibbd16bc77a559cb6af5c4a00c5c51f623ac5b710