Reconcile with jb-mr2-release - do not merge

Change-Id: I4bac19c3294083d1e1080cd4290165b7634fd7f4