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

Bug: 120848293
Change-Id: I938ce7aa12467727c3973307ea17b87b26409500