Merge "OWNERS: add Jeff and Alan"