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

Change-Id: I63a4384331e9ad04ddf930ce257ab3dd6191cef7