Merge "Fixed a typo in an OWNERS file." am: b3be864186
am: 98e94aee7c

Change-Id: I14654b8249e7407e46ee8c64ee49bc3e8e5d5993