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

Bug: 120848293
Change-Id: I215210db3eaacbf68bf628b651760a5f43e2b581