Merge change 25323 into eclair

* changes:
  Change handling of remoteUuids.