Reconcile with jb-mr2-release - do not merge

Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2