Reconcile with jb-mr2-release - do not merge

Change-Id: I92fd2ef799f358dd022234bc5fa7e6693f0619f0