Reconcile with jb-mr2-release - do not merge

Change-Id: I35dd28838537b7d96b26cf3731e7391af23b4b86