Reconcile with jb-mr2-release - do not merge

Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66