Merge "Update shim method to the updated API name"