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

Change-Id: I2bf7c9529616dd1d703b5c8b97957f4affb2901f