Readd AOSP 4.3_r3.1 mobile data changes

This reverts commit b1db26ddbe03d6271902e1c4717cf74f71282b3b.