Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kr