Merge "Owners file cleanup."