Merge "Fix infinite loop when registering data usage callback." into nyc-dev
tree: 5149eacac6701e247911346cb6ca8ee05f03ea89
  1. core/
  2. services/
  3. wifi/