Reconcile with jb-mr2-release - do not merge

Change-Id: Icb6a064ee14714e954177e5110282efe21727ec6