Resolved merge conflict on OWNERS file.

Test: N/A
Change-Id: I9fd55c11b177d7e0910f3e52ab67902bb8109745
1 file changed