Reconcile with jb-mr1-release - do not merge

Change-Id: I1a142d90b8fab7b6a1fcfaef81d7d32900226d20