Merge "Fix test from security feature provider."