Reconcile with jb-mr2-release - do not merge

Change-Id: Iba9f399b20d62611002d4353e00355b2550dbb1d