Reconcile with jb-mr2-release - do not merge

Change-Id: I716c266ad98beb8523f0e4a4a04bbc326388fe93