Merge "Remove redundant code in certificate pref controllers"