Reconcile with jb-mr2-release - do not merge

Change-Id: Id7784bb61428b43fb622db1172b66f402eebe2df