Merge "Use delta reads for per uid traffic stats" am: 48f46ac83c am: d5cc53302f
am: 8d027dd829

Change-Id: Ia2d3aad715dc1a2ff65ea9ec1a5badeda47c47a6