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

* commit '56997c441fb2515642d8c10f934e55a17e9a3105':