Reconcile with jb-mr2-release - do not merge

Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810