Reconcile with jb-mr2-release - do not merge

Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef