Merge "Add gaillard@ to owners."
am: 1e02188bfe

Change-Id: Ibb94159565a70a597de098f79c13c6a991e3ebcc