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

Change-Id: Ibc1e7d1b6be2915d4000cda2b7a9141ac387f7f0