Merge "Trim OWNERS" am: 204461a170
am: 8ae1dffe73

Change-Id: If2737e3cc8c252bb81abc22b0db31468824d5ead