Commits
Erik Kline authored 0c9cb2ba760
Stop using startUsingNetworkFeature
Also:
- add a few @Overrides where appropriate.
- some small refactoring/reformatting
Bug: 9580643
Bug: 22332501
Bug: 25824776
Change-Id: Id4f496ced4db15cd9da51c80c5d1dde06f476f54