Revert "Revert "Update for new version.""

This reverts commit 53372f270c36cc1770954fa60e274bcd97c81073.

Change-Id: I1eb631a2aba35de7cbb5a6a8f6518b62c6bc22b8
23 files changed