Reconcile with jb-mr2-release - do not merge

Change-Id: Ic5570b405d5139cad12192d143b749fe77746d78