Merge "update OWNERS"
am: a7b80e1252

Change-Id: I0458ec0a60944cb3e41bf2b548a04cc9c102a011