Merge "Add jiyong@ and smoreland@ to OWNERS file."