Reconcile with jb-mr2-release - do not merge

Change-Id: I4a1f42bbdff4a57def0a5452eb9e9649e10ddf89