Reconcile with jb-mr2-release - do not merge

Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097