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

Change-Id: I0bf2bdc56f46928b94f0954e799d51196171fdc4