Reconcile with jb-mr1-release - do not merge

Change-Id: Id03db4a4500f1e58a7ebc8cff60d46538579e8ab