Reconcile with jb-mr1-release - do not merge

Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091