Reconcile with jb-mr2-release - do not merge

Change-Id: I84ec0a95b1f215197352bf76b467325d5687ff62