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

Change-Id: I22c11fd546bbac42c1f0b841df23cf755afa3672