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

Bug: 120848293
Change-Id: I3171ce7488d4047115f8ee035f630daf4409da78