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