am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr

* commit 'a0010b81ad0e179a8336f84da84f7aed3dd54cb5':