Reconcile with jb-mr2-release - do not merge

Change-Id: I570dd02b7ebab54dcdf36b3a71aa5f4ed594ce23