Merge "Revert "Update neverallow exception.""