Reconcile with jb-mr1-release - do not merge

Change-Id: I39de058c910721092bc18c93ce0201848be97ae9