Merge "Remove chiur from OWNERS" am: e9395a3fdf
am: 4a24a32a1a

Change-Id: I3f7cc67930a5664401357f4a525fd98ca09e8bee