Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order."