Reconcile with jb-mr1-release - do not merge

Change-Id: I03d49c7a1f65fb04224bbc246d160e4dd3829d06