Reconcile with jb-mr1-release - do not merge

Change-Id: I3cd40c84fd37293ca96b5c35bea6c34871bf7659