Merge "Remove kjellander and add magjed+phoglund in OWNERS"