Merge "Fix incorrect syntax to use unstable-return"