Reconcile with jb-mr2-release - do not merge

Change-Id: I1eda90f9e35a674fa4f72c740ad4e561e0aa1c7a