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

Bug: 120848293
Change-Id: I4d500884139b866223b9fb4cd5da0b49f2f6ac72