Reconcile with jb-mr2-release - do not merge

Change-Id: I76df284cf540db487c7131e5da1fc88f8669fe91