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

Change-Id: I3ae2a1953d9a6e22aa972552f7afc7abfb8d11d1