Reconcile with jb-mr2-release - do not merge

Change-Id: Id47cc82d638cc12e7db5abf7e9f6a0a164e551f3