Merge "Update owners file" into oreo-mr1-cts-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Wed, 17 Jan 2018 22:30:54 +0000 (22:30 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 17 Jan 2018 22:30:54 +0000 (22:30 +0000)

Trivial merge