Update contributors for maintainers

Change-Id: I33ca8b3c41299efc72f38e12830f6e2d26d41406