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

Change-Id: I1dacc7eb56c438ce9ab211ebdc1b19860bddc0c9