Merge changes Id78aab9c,I51096b18 into nyc-dev

* changes:
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.