Use compute_driver instead of connection_type if necessary

Change-Id: I40993d52f762805e41e8c4ec3e8347f79ee34869
Merge "Use compute_driver instead of connection_type if necessary" into stable/folsom