Reconcile with jb-mr2-release - do not merge

Change-Id: Icad78517674982f0ed6f87a7cc72a4d5b74a519f