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

Bug: 120848293
Change-Id: I7edffee3afef0e1f5e56cab8040259fdcb924498