Merge "Location OWNERS updates"