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

Change-Id: I8b950e7b4395272e57b2a62af40854ad76ff71ae