Reconcile with jb-mr2-release - do not merge

Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b