Merge "Update comment for deprecated method" into rvc-dev