Reconcile with jb-mr1-release - do not merge

Change-Id: I801dd8874ff1b1b61858cac3bf716906825b214d