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

Change-Id: I4df1ba6a619529d9f5b96e8b7ed8bc470a81e2ad