Merge remote-tracking branch 'goog/jb-mr2-release'