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

Bug: 120848293
Change-Id: Id23583772176f0330d53dd6443b66bf81bc641c4