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

Change-Id: I5ab13bb7db5ae21de872f5fcb2b021c22f2c7186