Merge "Change types of fields of network stats reported to framework." am: 2c0a0092f1 am: c53ca081d4
am: 1b77ce4858

Change-Id: Iab166b8b06d3a744b8cfc83e0467c478642ce185