Reconcile with jb-mr1-release - do not merge

Change-Id: I3bafd77a8fe73cc617dda88332b1a403f4803402