Merge changes Ie762ce75,I611fd791

* changes:
  ConnectivityManager: unit test for argument validation
  ConnectivityManager: uses service error codes and exceptions