Reconcile with jb-mr2-release - do not merge

Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2