Reconcile with jb-mr2-release - do not merge

Change-Id: Icdae0a2edb5a49e2430c073e50f215960925865b