DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I68a740e3f1ece2e98324d933f1e2b71adb0ca1ea