Merge "Revert "[spatial svc]Another workaround to avoid using prev_mi""