Merge "Split device owner config files"