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

Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785