am 40de3917: Merge "Icon updates: location, settings, cdma roaming" into klp-dev

* commit '40de39171b9ddf49c20600d750b99e4033416665':
  Icon updates: location, settings, cdma roaming