Merge \"Set version to 1.0\" into nyc-dev
am: 6ab3c01d18

Change-Id: Id05c75208093eaaab3e0732bf9c1767535e6d230