Reconcile with jb-mr2-release - do not merge

Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21