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

Bug: 120848293
Change-Id: I777fce4d240093c5a007ea4b47ef18182e73b676