Merge "Actually make OWNERS in sync with the internal version" am: 7e54042f9c
am: 83c37379da

Change-Id: I1bbd7ccc7b610d9cbdcf9f7f8f52b734679766cd