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

Bug: 120848293
Change-Id: Ief855c9798c78e3c0d5f6642406bcd31e9992995