Merge change 26217 into eclair

* changes:
  Cache the remote device's service channel.