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

Bug: 120848293
Change-Id: I6c1d1803ae56251d686578b4c4f3bc7b140977d8