Merge remote-tracking branch 'goog/master' into jb-mr1-dev