Reconcile with jb-mr2-release - do not merge

Change-Id: I24038f939a31f582d6efc1fbe1488e7b15112b35