Merge "Refactor OWNERS file."
am: e27b409046

Change-Id: Ibd472d9389bd3892e0e796b284849328aae13517