Reconcile with jb-mr2-release - do not merge

Change-Id: I909757af432b975983b072aa2c00b89aac24f4d5