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

Bug: 120848293
Change-Id: Ic4f6f0bcb6e8f624e088582c9b280761f6e7cf0b