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

* commit '7eff765ccc83a41c8bd7207b0cc0c5227eae9dc5':