Last minute changes, update version for release

Change-Id: I4fd558abd868c6c4bc9d3e8833878c9cc1cedff9
6 files changed