Merge "Fix bad copy-paste error in deprecated method"