Merge "Fix NetworkStatsAccessTest" am: ec1f25a4ba am: cdb75d321b am: 85afabc4ec
am: e6f44606ef

Change-Id: I838ae489f7d7a287291a1fc14d9e2f816cc29d14