Merge "Add Xiaozhen Lin and George Chan to OWNERS"