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

Bug: 120848293
Change-Id: I76b026a22ef5fea2ad1a141c32e95420f0c941ef