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

Bug: 120848293
Change-Id: I81a96ddfd30b4e112eba4df72a92a78150a078e4