Merge "Neverallow vendor access to system_file."