Merge "Increase injection timeout for InputFilterInjectionPolicyTest"