Reconcile with jb-mr2-release - do not merge

Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01