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

Change-Id: I5f004fa3b810c03dbb419f13e5767ede992f509d