Merge "Fix NetworkStatsObserversTest" am: 0dc35fa969
am: 25282c3e38

Change-Id: I8cc0dc340d3108d74cea96487560bbc8cfa2f650