Merge "Fix NetworkStatsObserversTest" am: 3ba0e6ce34 am: 25282c3e38
am: 814351c843

Change-Id: Ice4bb8de4267cba7a15a60838e165fab5ebade72
tree: 93ec5cea0f849e6d8520c51425308b37446d10fa
  1. core/
  2. services/
  3. tests/