Merge remote-tracking branch 'goog/jb-mr2-dev' into ur9

Change-Id: I1322290c0b5db087429c21750720029814b575d8