Merge change from google, including a lot of movement towards the 1.0 final apis.