Merge "Trim OWNERS"
am: 204461a170

Change-Id: Id7ae344a5118cd655b64d2d1ed0a42f1477743a4