Reconcile with jb-mr2-release - do not merge

Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55