Merge 'jb-mr1_mkt' into jb-mr2_mkt

Change-Id: I540fac9db014910a97a6bf8ea8ac40928f2dc701