Reconcile with jb-mr1.1-release - do not merge

Change-Id: I189f31812ca5c5a5a6fc95ed35bf38664c6afb6a