Merge "update owner for shortcut related test cases"