Reconcile with jb-mr1-release - do not merge

Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12