Merge "Refactor OWNERS file." am: e27b409046
am: fa974346e4

Change-Id: If69a9fcfd2d061b7d93afe0bf1c8126d0a4bb464