Merge "Trim OWNERS"
am: 0e79d155b3

Change-Id: Ieb50fc6578e529b94f5c8e2045ff02990941fbfd