Merge "DMaaPAuthFilter refactor"