Merge remote branch 'goog/master' into honeycomb-release