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

Change-Id: Icf6bd8de1c725cbda728b10b67f65f0940e7f154