Reconcile with jb-mr2-release - do not merge

Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b