Merge "Update OWNERS file"
am: c6b349b881

Change-Id: Ia3b8bb437c91480eea4e6da81c599aebe23a9157