Merge changes I773aeabd,I6a9d7044

* changes:
  Refactor DataServicePreference
  Refactor 4gForLTE preference