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

Bug: 120848293
Change-Id: Iea5fe5243401b3b768d9c2730be294558463be11