Merge "Partially refactor Tethering to new network callback APIs" into nyc-dev