Merge "Change strings from "Cellular" to "Mobile"" am: 5549eee198 am: 0090ebf50d
am: cf2f56e0a2

Change-Id: Idbad9efd72ead56337e8f11b5060ab95f99bfd98