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

Bug: 120848293
Change-Id: Id60223f3f375d6d351c72f36fb6783c1c26b29ec