Merge "Change scan flags before applying policy"