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

Bug: 120848293
Change-Id: Ia9eaedc64aa8e9ab7c1a10edc175415c09fcf13a