am 8ed0b767: am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9

* commit '8ed0b767325296104e67a86671113f0329257cf1':