Reconcile with jb-mr2-release - do not merge

Change-Id: I6854ee735b15189c2987281e5f0525687dcb3b21