Merge "Remove inactive owners from OWNERS and add active owners."
am: 96fd6a79a2

Change-Id: If4fb2f9e9818d79dc72cd1ec488508d8e65242ff