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

Change-Id: I898e275ae0f9367e379070a709588aa9bd7d97b4