Merge "configure owners for shortcut related tests"