Merge "Define wrapper classes for WiFi and Mobile indicators" into sc-dev