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

at a4db090b1345038a89a38ba8af6ac74f71e2ed7c