Reconcile with jb-mr1-release - do not merge

Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b