[automerger skipped] Fixed handover issue on connecting data connection am: ed7a0e8d
am: cd218106 -s ours
am skip reason: change_id Iea9e87d1c79762bc6f233e0de7af9184753656c0 with SHA1 ce85ca8e is in history
Change-Id: Id003f78f6799d30bd6f05a2483980a6036fd821a