Reconcile with jb-mr1-release - do not merge

Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0