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

Bug: 120848293
Change-Id: I6cf39dc1d6bcc72fdc07bec2d884401d172d0916