Reconcile with jb-mr2-release - do not merge

Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760