Merge "Trim OWNERS" am: 0e79d155b3 am: 2857b8009e Change-Id: I22529b2c8eea99ecdb5baac4b9fb3a12c07afa51