Reconcile with jb-mr2-release - do not merge

Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4