Amend: Changed version numbers per discussion Amend: Actually added changed files to the index Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5 Former-commit-id: b65366dcdfa48e431b5c8bf10a72879b111cfd8d