Merge changes I04dfc5c2,Idc7e1f3c

* changes:
  Updates OWNERS files
  Update OWNERS file.