Reconcile with jb-mr2-release - do not merge

Change-Id: I7ac8aed8285894ac658717c6c80999c2a744cd5b