Merge "Remove deprecated TYPE in rest_client"