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

Bug: 120848293
Change-Id: I59ea243c79b9f9c91da7d9eaf87207e7fdd4c076