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

Change-Id: Ic360ba18ba0187bb458015e288256478063ed95f