Reconcile with jb-mr2-release - do not merge

Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099