Merge "Remove kjellander and add magjed+phoglund in OWNERS" am: f296afbce6 am: 5f8fb22a8e
am: 1965d6fb6a

Change-Id: Ic5d723add06c187c418b407021672a8abf33b3f7