Merge "Fix data connection support on emulator."