Reconcile with jb-mr1.1-release - do not merge

Change-Id: I01253a246391b976768fa35cecaba09f15e2bcd5