Reconcile with jb-mr1-release - do not merge

Change-Id: I91388e10ace70e946c571c5a54438cfc0f96a2f4