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