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

Bug: 120848293
Change-Id: I79acd0381bc7a7be71c190a7540e9e3e5d0d4cb3