Reconcile with jb-mr2-release - do not merge

Change-Id: I622b9f4ffd70370513d8535ecf490d68f0686782