Merge "Update remote-shell protocol to 20"