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

Change-Id: Ib63c7411e28e48201217c4a164c41d4d3223ca51