Merge "OWNERS: tobiast -> ngeoffray." am: c39448de67

Change-Id: I73c85a337f77b389d30f66d53f78708dce5e6f8d