Reconcile with jb-mr1-release - do not merge

Change-Id: I687546ca2bdfc152e141cda550975329f2bec732