Reconcile with jb-mr1-release - do not merge

Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8