Merge commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d' * commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d': Cache the remote device's service channel.
Merge commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d' * commit 'd86c07a884aa0242126c4e2dfb37eda526f58e1d': Cache the remote device's service channel.