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

at e6e0af03ee39b3e800c8f7e86eefffae432ee7c8