[automerger skipped] Merge "Fixed that data not disconnected when mobile data...
[automerger skipped] Merge "Fixed that data not disconnected when mobile data off" am: 7fb2d607 am: a06f977e -s ours
am skip reason: Change-Id Iaed3f22317f21f7344d103841bc3c6374a31c492 with SHA-1 dcb4fd56 is in history
Change-Id: Ieb07094579052a93ca126572e55db106f330cd51