Merge "Update owners file" into oreo-mr1-cts-dev