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