Merge "Add timeout for XTRA data connection. b/22540683"