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

Bug: 120848293
Change-Id: I3cf0d719ede7af14c8552a261dc690b5d797cadf