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